Merge "Add charging metrics" into pi-dev am: cf4f650572
am: 976f6ade83

Change-Id: I31d5c785f45fe72443dcdd24c8714dd6f69ada8c