Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... am: e2427502f1 am: b492ba5333
am: 34734113e0

Change-Id: Ia1b3c12a96df2774bc780e58d1c6748e1f61e180