Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am: 8bf32cc2bc  -s ours

Change-Id: I5267762ab4e84f55858bf51d51aa51079432099b