Merge changes Ib4f6b1b4,Iac340c25
am: 4c0eb48014

Change-Id: I3110b9c77f0f96a7db446b9d60e8081f7ea602a3