am 16b5480b: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '16b5480bd0a0e9e6830e3bcf36c923a5e872aff2':
  Import translations. DO NOT MERGE