Merge "BatteryStats: Bump checkin version" into mnc-dev