Merge 0e71d7e2b257800b252a9fae3d9f0fc8c9f6cb24 on remote branch

Change-Id: I723e8fcfb59bcce49dd90523d1464d8902465179