Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 4a1e89ba44  -s ours

Change-Id: Ib8d9861b29cae7b5c2a2dfe2474b33572918c895