Merge c2c1aea026ab790ef53bdee50b7b50670d920005 on remote branch

Change-Id: Ica1099043683ce3966bb7395050195559b91eeff