Merge pull request #9841 from JosJuice/revert-9835 Partially revert "Android: Clean up some hardcoded strings"
