Merge a83454546ac0ca526af310636f382ddea27baa44 on remote branch

Change-Id: Ic41c8fffaf0cd70a1c86090ebb9affb9d0771a00