Merge 84777f7f360652571f13847a1e1b5b917e0fed82 on remote branch

Change-Id: Ie5d3f03cf9b570f7b24953a25f3566333c08d492