Merge "Changing batterystats to use proto values."