Merge ce4898d7609731660dc22d246757d570bec7e347 on remote branch

Change-Id: Ibfe8239df26be9369b1410b5daf9a72eb6ef80ba