Merge changes I7f32dc9f,I9d88ddb1
am: cd9ce19e9c

Change-Id: I3294cceacf564de140e374068c5ed3974df1875c