Merge "Import translations. DO NOT MERGE am: cdd4f84e06  -s ours am: f3b6338d0f  -s ours" into nyc-mr1-dev-plus-aosp