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

Change-Id: I9bd233385bb5dbe765bc3ba64ef65c1e467c4aac