Merge "Add battery stats to telephony bugreport" into pi-dev