Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 94942bb070  -s ours am: c92dca01ec  -s ours" into nyc-mr1-dev-plus-aosp