Merge a9fda9b34623bb20c02bc0062095dc3a2b2fe45c on remote branch

Change-Id: I2b50857d556d5659f9477626c301e8e4282ace95