Merge c69bef84aedd1242ed637501db37eb86ff8bab06 on remote branch

Change-Id: I80f6f096893b763b8a63ef8c30367f86e681983a