Merge "Add me to owners for batterystats."
am: 274ce2d831

Change-Id: I778b676a418817917421fc0794793131e5fd5d3f