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

Change-Id: I1f54be48bdf462315186026871429f54f9a7c332