Merge 4d77aa365feac2406972c48cccc6f4a940d7ad9a on remote branch

Change-Id: Ia4c60e85dc7abeb2f78dff730de21b4b2aec58d1