Merge 539575f907757ee3f81266f477c111cf0bc61b76 on remote branch

Change-Id: I925b85c1732bfc73f16edcd503b208f2b80b7f06