Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949  -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 5ae680c1f6 am: bfc689cbfa am: 92937e0f0d
am: 91d92794fb

Change-Id: Ia4f5fd92e7f7cd00008f0ae4a12d38054e470792