am 450fef15: (-s ours) am c730c00a: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '450fef15a2168d37385bd5664fb5dae20e40fdd1':
  Import translations. DO NOT MERGE