Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c52adeb73f  -s ours
am: 672cab5856  -s ours

* commit '672cab58568d2cd1e710205a2e746a9eed9dea91':
  Import translations. DO NOT MERGE

Change-Id: I512619eb93c1a8238df4de7d426cafde93ec81f8