Merge 0c8af79193cfdc14b92c62647250efdd623df2a8 on remote branch

Change-Id: I547cd05e765b45054cdbca3b633b8bee49366dd3