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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b739 -s ours am: de2f136d -s ours am: 2b4cbd1b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e5368 -s ours am: ddb8e910 -s ours am: 319f7339 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be81976 -s ours am: 8c54572d -s ours am: 8bb6bc8a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e7 -s ours am: 7e372d0d -s ours am: f28e3def -s ours