Merge 5a0922387d16cdb3ebeecb6e5a0b89c671e5a1cb on remote branch

Change-Id: I9c9f4bb09a91c98249d4ef0d8bbd65b405fcb3ba