Merge "Import translations. DO NOT MERGE am: b004945727  -s ours am: f1a5ffbf99  -s ours" into nyc-mr2-dev-plus-aosp