Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 7acceb8746  -s ours
am: 0a9904d90c  -s ours

Change-Id: Ia2b552f8db5f7c947ba13e54bddf6bd235d9256a