Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f3f4f78dc7  -s ours
am: 0e4a8f5f41  -s ours

Change-Id: Ic0894bfb2f8e5d5c9850caf6110e4e24959e6bac