Merge 57f054fabc7a38dc59a2b297534cf80b02ba596f on remote branch

Change-Id: Ifd4711cb9684ff2f2b7a4b3ae369a281d7138678