Merge ff740c6b8a2c8c9937ece90c551176686ac33457 on remote branch

Change-Id: Ia07c54ed644db5cecebf3b8c2a05a7bea3c1d791