Merge changes I7f32dc9f,I9d88ddb1 am: cd9ce19e9c am: e250aff83f am: 0fdf46eeae
am: 1d1d6a3af7

Change-Id: I6dfcf630d36441943eb4d181d435a2032dc8395d