Merge 2c79fa65a4fc5d4cd32e251c0616a8d5aa9775a9 on remote branch

Change-Id: Ie2d6b07ed10cbab284a228b16b50edb865b84444