Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 917ead578b  -s ours am: 713a057fb6  -s ours" into nyc-mr1-dev-plus-aosp