Merge 923a0ee9decfb5b415579424891cfd532ee2ae42 on remote branch

Change-Id: I39e266158c7a7299b51de6b39cfe043632683554