Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev