Merge changes I6ff85723,Ia7d743d5 am: f4ddee0f32 am: c01a10f1b6

Change-Id: I7eb04fb1c3af1cba0c10def7fa86ec9852e0f34f