Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ... am: e01b4ce6c7
am: e06ae295a2

Change-Id: If4f9e1b498855af05011cbd0f529e346bebd4cbd