Merge "Add proto output of battery usage stats"