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

Change-Id: I743b1b6f7bb8d1963711e2c79956223fc549e88e