Merge aac5c3ce8dd39be227f4b71faa4c74bcb6c290d6 on remote branch

Change-Id: I2e5a1e586121efb56ecdcb628feb469de512345b