Merge "Add charging metrics" into pi-dev