Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa  -s ours am: 0118fbd3ef  -s ours
am: 661cd803af  -s ours

* commit '661cd803aff4a42e19893516d053775a41497233':
  Import translations. DO NOT MERGE

Change-Id: Ifc727a9696cfc8c1e16b56bcea58e16b480810f4