Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev