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

Change-Id: I7b7f352b2269867ab2d4430b13b11d552543088f