Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949  -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 73452ebcd6
am: a09b52458b

Change-Id: I072092fb0b97a36936618ced8654a522f2f9a0db