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

Change-Id: I70dbac4cb8002d8f216991ca78b18e9c1612eb89