Merge "Update USB charging strings" into pi-dev