Merge changes I3501f92a,I7cfcae2a,Ic942ef66,I2af0e957 am: e1a4f3bcc3 am: 3e9415a6d9
am: 67118e5257

Change-Id: Ib04f29e0bc1638992659ea46e42c98d2996abb3f