Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e0ca918e23  -s ours am: 29a8e54150  -s ours
am: 66c4215c27  -s ours

Change-Id: Id432530815993f340f68f96ceaa423b69ea4832a