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

Change-Id: Ia9f81fc180122669361778a8acea5cb5f54d8df3