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

Change-Id: Ie518a5f3bb50717a5ec6eca687ab582f47177bb7