Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 063357312c  -s ours

* commit '063357312c77681ca7093f4416ed12ff0ae04c83':
  Import translations. DO NOT MERGE