Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev