am 4137ff1c: (-s ours) am 8339bf19: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '4137ff1c': Import translations. DO NOT MERGE