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

Change-Id: I0d4045fd70a99ddd84c841435a30296e5c726463