Merge changes I59024a0a,Iafd12e5a am: 19377a55c5 am: 8baf87c79a am: ce0eff9912

Change-Id: I98bc26e679c4a800f114dc39f8dde913888e4a7b