Merge c1dfacea277a94b9798d93b949727784f5bc26a1 on remote branch

Change-Id: I2d45b0ec1051a481f62968f816b592f178335272