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

Change-Id: I363d1ce470f0d44caf1c12d4843d0f84a87b6f59