Merge 6fd4ecdbb8d730ea4f7e564892b111eaeb53d463 on remote branch

Change-Id: I9ad93c88db15485763ca9b66922be7501dc81a60