Merge changes Ide5595c6,Icf56f2a1 am: 2f8503675a
am: 8962769dde

Change-Id: I216a8ae36b6a5bab027166aadffb33a75bd00420