Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f  -s ours am: 373ad6f5a1  -s ours
am: 0957435430  -s ours

* commit '0957435430e5aa68a904069b15f4c43f9e05e14c':
  Import translations. DO NOT MERGE

Change-Id: I84d25c70b06928294aa13a00dad35858570a6157