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

Change-Id: I41ec64a246d474c4d12495af1e7538cb43eb7dbc