Merge 662199b094d4865bfeefc645700c26d901e71b86 on remote branch

Change-Id: Ied2bb24c96220fbdc1118547f5701fbca717a588