Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899  -s ours am: 06be362  -s ours
am: 42e6053  -s ours

* commit '42e6053970f00453277ba876b04b34b1e12869ef':
  Import translations. DO NOT MERGE

Change-Id: I363140feb843e1e5533cfb9caa8a6275c73b137a