Merge a39d261b4fec56f6d40d0ba0bf0bc3e3aad1b8a3 on remote branch

Change-Id: If732854ef2f560cb4578d56cfcdbb7afa9350339