Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec
am: 16af70a949  -s ours

Change-Id: I716702080e330b73d3e343e892949e488b0f54be