Merge 781cfc8b70857a91bcbdb47baa3fdaff4710b6a9 on remote branch

Change-Id: I14db31b322d381a2eefde3dab9fd83520aa478d7