Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809  -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: a8cd228fc7 am: 5b6859d20d
am: 29eab65da9

Change-Id: I7159c03722f1c2918fdfb3ed362b2f284a4d2329