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

Change-Id: Ic94c92c684daeb486833a0c0ff090b1637e13b18