am 196f1408: (-s ours) am 53b029b6: (-s ours) Merge "Revert "Import...
am 196f1408: (-s ours) am 53b029b6: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
* commit '196f1408':
Revert "Import translations. DO NOT MERGE"