Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2  -s ours
am: 652af4f813  -s ours

* commit '652af4f8133741752ed3146b7408144b28c45eff':
  Import translations. DO NOT MERGE

Change-Id: I7346c446e942b1f57f97d5341cca64f43f2e6489