Merge 920ccb367b5b6ebf2557d0d99c12e657cab73c5a on remote branch

Change-Id: I8f44e21936c04477bdcf96f450610f09cbdcd369