Merge 57f054fabc7a38dc59a2b297534cf80b02ba596f on remote branch

Change-Id: I484d6ff6f5fbee99048623943613ae4cf6c2d288