Merge "Removing EXPLICT tag from Batterystats metric names." into pi-dev