First sync with the 4.3 changes.
Still tracking 4.2 translations for now. (cherry picked from commit 991454b8bd)
991454b8bd