Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: fb57efa485  -s ours
am: 7aaca71074  -s ours

Change-Id: I9afffc9215c171a5689ba6a1ff8dad3c46e0b129