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

Change-Id: I5aca7389a57392904c5f68f14036e67ab8cc709f