Merge changes I5199a7e9,I386ab7c1,I2038c77c am: 524fc465ec am: 5c9f06ae45
am: df7a23f11c

Change-Id: I90403e6117aca8d0cc2c56e0fb0721cdc90920af