Merge "Merge \\\"BatteryStats: Fix read/write parcel order\\\" into nyc-dev am: e8a442ccd6 am: 860e09ddce am: e9fdfb6334"