Merge 9393c6227e4e8f811f29e48195c79d46b69c1725 on remote branch

Change-Id: Ifbc0b267dddbf4c5603cf87316557fc3e4ef763a