Merge 374f34b3e09f7394dbc6e3fff6e3ca7ae62127f6 on remote branch

Change-Id: I42c57ef42019f997c61c33e7011098ea19cd803b