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

Change-Id: I1a45683e67da52881a0e050c6957b4402aa47013