Merge 8b699bc1775f1df3eeed557c6aaf5fa2d647d6f6 on remote branch

Change-Id: Ic5e520311db758d8faa930d7f6a2e02ee58e7971