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

Change-Id: Ibf08eb4fa1fc238f972a5efac35ab1092535bbd9