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

Change-Id: Iab1725c0979838dd965ca51f762ec7e8a648e7ab