Merge changes from topic "am-a8eaeda526cf46149976e0ed042c558c" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e0156d2e -s ours am: 427d3abb -s ours am: 5c742769 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3512e09 -s ours am: 182fba5e -s ours am: de4421ea -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ea4f6ffe -s ours am: 952425db -s ours am: dfb0db67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 46ff275b -s ours am: 1a5279b8 -s ours am: 9469e203 -s ours