Merge "Revert "Revert "Change battery tip text"""