Merge 5a178c81cc8aa5bd3dab3d1b948cd70544ad3e2b on remote branch

Change-Id: Iad66f3c106c6a6d9774fe3c9e5bbf2e392271bee