Merge 62974764343414b9a7c7dcdaebc88ad24a91ad4a on remote branch

Change-Id: Ia1c67b1e32cd9685e941c5f112f4db17a59be034