Merge changes I5199a7e9,I386ab7c1,I2038c77c
am: 524fc465ec

Change-Id: Ic7acf2fc2c83eb92129a1d74d8fff1a61683acd9