Merge 57f054fabc7a38dc59a2b297534cf80b02ba596f on remote branch

Change-Id: If17d31cab5cf2a3597f9073edbc61ec20594ccd4