Merge 6024c676cd8eada94651fea4e175923c152c7d07 on remote branch

Change-Id: Iccba943983243e297dc95632aaf57254164f79bd