Merge changes I7410915a,Iede082f5 am: 25ed6783a1 am: a94ac660dd

Change-Id: Ib3e32d145bee6ed64a2c7d025fb3c6d21ae8baee