Merge c2c1aea026ab790ef53bdee50b7b50670d920005 on remote branch

Change-Id: Ia395741ef348becb26e8e575928354eaacd4c4b8