Merge changes I8e76b5e6,Icf6851bc am: 4123441a04 am: 17f618fb5f am: bd771d8286

Change-Id: I397fab13df2da9c045a22f0ca7553d67bbbbe821