Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1b93d5c5a1  -s ours
am: 8e4618bca6  -s ours

Change-Id: Ibfdf60ceeade0025ec643e04bf675cca752f5990