Merge changes I6779a835,I4e3d8322 am: 1fbe962482
am: 3b3f420481

Change-Id: Ia160de158a931613754e57202de4f3cac610c7e0