Merge changes Ieea7af39,Ic3755d1c,Ifad24b27,I3b33f2b8 am: 7709bcf840 am: 0e1cc5b26c am: c7995d6bdd
am: 331249c6d7

Change-Id: I842aa3d33901bea77dd709194c52c711a4e3ecdc