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

Change-Id: Ia28e03ec95f4a1f3a6708bcd0610ef5887f75a06