Merge 67bc36b59d9ed99674648086d8464a5a5b5b2c40 on remote branch

Change-Id: I2bca8cc2cecf1270653510d2257463ebd17ee9a1