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: bfda53b4 -s ours am: 08e6cde0 -s ours am: 1a7dc308 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36bf2547 -s ours am: ca6a96b0 -s ours am: 42e51ce3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a0a1639b -s ours am: 63f80110 -s ours am: 3420e4b0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c8b79c3 -s ours am: ed1db244 -s ours am: 96389185 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8cea102d -s ours am: a6344f88 -s ours am: 4d31b7b3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 505227dc -s ours am: 57c0f766 -s ours am: 1a708116 -s ours