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