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

Change-Id: I5ad5e3077ce82817a5837e65b06141a21c36af6e