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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1e95f1ab -s ours am: 1c090021 -s ours am: bc82814a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 419aedc2 -s ours am: b503243a -s ours am: 83e75ea5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: cc3a2fb6 -s ours am: 01b1c7f5 -s ours am: aaf8d678 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c46e497 -s ours am: cea45496 -s ours am: 9a0d7055 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e8fe645a -s ours am: 35987e05 -s ours am: 0c9bb043 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c131f5 -s ours am: 982f5aaf -s ours am: 10094ca3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 513d9fbc -s ours am: 42ec4dd9 -s ours am: 5defaadd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6fee1c3 -s ours am: 59275138 -s ours am: 9ecdfd73 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d008d4c7 -s ours am: 39099895 -s ours am: 2396a8e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 321e47a8 -s ours am: 0eb3c82d -s ours am: 600f7a61 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 87fd93a3 -s ours am: 50971d94 -s ours am: b465faf7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efcb53d0 -s ours am: 6c8da84f -s ours am: c77fde38 -s ours