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

Change-Id: Ifc47542faa17acc3da46826da0da09c981fc5066