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