Merge commit 'a5ca3425f9cbb930dc62559893590432ed29c961' * commit 'a5ca3425f9cbb930dc62559893590432ed29c961': Increment BatteryStatsImpl's VERSION.
Merge commit 'a5ca3425f9cbb930dc62559893590432ed29c961' * commit 'a5ca3425f9cbb930dc62559893590432ed29c961': Increment BatteryStatsImpl's VERSION.