Merge 1855b69e1d705ddb011043a62437043c05d4ade7 on remote branch

Change-Id: I91eb2157e05a8b637765a2be4e66223919369461