Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7533f3260e  -s ours
am: d07ea5440b  -s ours

* commit 'd07ea5440b341a0e2885eb8bd47e5ed04f11c2cc':

Change-Id: Idcb4b1d9728f3aeffdeff28b916b65c646370aef