Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5 am: 70ad27cfb5 am: e4a6ca7231
am: 89e543fe54

Change-Id: I2ac4405b4dc67edbda8dd94b877b4c7724d34509