Merge "Bump the BatteryStats parcel VERSION" into mnc-dev