Merge changes I6345a10d,Ieed81827
am: 907cc62b6d

Change-Id: I0b82d369e32c266f47c78f6ae55e994b6b486a0b