Merge changes Ide5ec431,Icf2f8fae
am: 5e20ba7b1c

Change-Id: Ide0aa248d03d0d0aec715d8630ba738e8c06291d