Merge 0e71d7e2b257800b252a9fae3d9f0fc8c9f6cb24 on remote branch

Change-Id: I8e8e992d5e31f1d9e4438e4e47e0761a541dbbec