Merge changes I06ccca30,Iee86b058 am: e6ae06e687
am: 3504d5a535

Change-Id: Idb80639b32c461b573553ca5da8e8a388236b8e1