Merge changes Ie2c5e36e,Ib058fb62 am: 70b5245c07 am: 0468c9d356
am: df948fd9aa

Change-Id: I9040f30a36b3a51e382f2d6e0a1a4ec9e4490788