Merge d878ae91c7edf3404625e33e55fd9f9cda0847c9 on remote branch

Change-Id: I2a0f7deef64470a216b0ea43def01ca757327c55