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

Change-Id: I05088a0fd82bd44fce20fa089bd008c29120db3e