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

Change-Id: I766d7eb612200e0ae9f6ae3eabf9bab92c152cb1