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

Change-Id: I0042f5cf7a9ab2698a0436ffe00d94b4d6e0c71e