Merge 7f139799900afc1195e473859433e23fca3aa112 on remote branch

Change-Id: I19f268f7d1de73735c3ca700fb0bc38cd08bab9c