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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0ba8299 -s ours am: d9106a4a -s ours am: d1b73af8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b9f600e -s ours am: fd83451a -s ours am: f7cb575d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b715de2b -s ours am: 7cd8f04d -s ours am: 94bc15a8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a839aa64 -s ours am: 60275978 -s ours am: bc457b03 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19315466 -s ours am: e58493ff -s ours am: e5833048 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cb2b724 -s ours am: 959cc8ec -s ours am: 8b36ced8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fa4f9faf -s ours am: 13eabe85 -s ours am: 7998c59e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 43ea2750 -s ours am: e35d4ebd -s ours am: 2c9cfc59 -s ours