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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f93b5739 -s ours am: bc26123b -s ours am: eec7bcb1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 314cb91e -s ours am: 85e92515 -s ours am: f39a581b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6c100003 -s ours am: 043d53ce -s ours am: f5fe46cc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 555491bf -s ours am: 48e7b29e -s ours am: 24382f78 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b1b516ef -s ours am: 0d730cef -s ours am: 3c8345c7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 929d4a52 -s ours am: 20174b0a -s ours am: ba2acb41 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0c62084b -s ours am: e6c6c848 -s ours am: caa6196b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 492eec1a -s ours am: 9f7e62d3 -s ours am: 261219c0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2e0f49f -s ours am: ff70b84a -s ours am: da3d2161 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a97e30e -s ours am: c382ea30 -s ours am: c4f9bd8a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a7b92545 -s ours am: e6ac2b15 -s ours am: 3e50859a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cc4c9ce -s ours am: a46e0a7b -s ours am: 28fc1d46 -s ours