Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3  -s ours am: a882b8c150  -s ours" into nyc-mr1-dev-plus-aosp