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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ce944699 -s ours am: 908a68a5 -s ours am: 83db8ee4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2aa37fc6 -s ours am: 263624d2 -s ours am: 3f848969 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97eee9f0 -s ours am: be44b9eb -s ours am: d2d7b2ed -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 03a738a6 -s ours am: bbb9e170 -s ours am: 56e694e3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 54cabdde -s ours am: 5c5305ea -s ours am: 5d7aa6d7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a9fca7d -s ours am: cf84ad5b -s ours am: 6c1675c7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 64bbf7fb -s ours am: 37135e55 -s ours am: 22d2f809 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47c4fec0 -s ours am: ac82d2ea -s ours am: b05bc156 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 57effef0 -s ours am: c28b33a6 -s ours am: ce716aae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0353bb6e -s ours am: 0e85ea7a -s ours am: 3271fcd4 -s ours