Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e  -s ours am: a2a976498e  -s ours" into nyc-mr1-dev-plus-aosp