Merge 1ca1d1e4a74da680a619b11a3349759af891b198 on remote branch

Change-Id: Ic22b6f6961686fa2f906aa9efd5273a3983bf948