Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 384007ac74  -s ours
am: 3b34a40c74  -s ours

Change-Id: Icac4bb5a9a9ee58aaa73e4014174dc6d65ecae8a