Merge changes Iba0c3893,Icf3039ef
am: dc9f2de809

Change-Id: I4596ef79ca88e29e96995d6f401a6fada77c6174