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

Change-Id: I914bbe3cac87fbefda22f47059ce58d19981835d