Merge changes Id4d040ea,I318fb1fc into mnc-dev
am: a2603bd360

Change-Id: Ia22d1824913e82550dae44a799cb9da4c7344949