Merge e3f0fa71e2ddbfb5d687e911906b7740cb96b7b4 on remote branch

Change-Id: I0ca50244b9cd3544f8b0fbbbddb7180d2b2d271b