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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2a0153c7 -s ours am: a7aa55fc -s ours am: f40ea52d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e99e2b2a -s ours am: 676e3cad -s ours am: b92e21b3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f5b6c8fe -s ours am: fe34dc4e -s ours am: fce84827 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e34480cf -s ours am: d0235b84 -s ours am: 6d13a03a -s ours