Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809  -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3
am: 07d9fa6787

Change-Id: I24dc2bc058fa34b0da8a75acb192156f71316d84