Merge 577bce7e2d1b147fead71a68702e491c5aee889d on remote branch

Change-Id: I16d356dfe09ffe17cb601187f03fb3589ab8ef88