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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1ee47fe2 -s ours am: 70e6061c -s ours am: 2054e632 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58506c51 -s ours am: d6558f41 -s ours am: eef6a849 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: cbcbd8ce -s ours am: b76921b3 -s ours am: 11fcba42 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f154164d -s ours am: d51fbc90 -s ours am: a4b3ecc2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 53571372 -s ours am: af1f6596 -s ours am: 5c4c3496 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 259bd306 -s ours am: ab2bb2c6 -s ours am: 6ae7423a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a06ba20d -s ours am: 80568cdf -s ours am: 753872ec -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bfb88c9 -s ours am: 4e431a5d -s ours am: 2dbb490a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f87f122c -s ours am: c3149073 -s ours am: 72cecc31 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47b77e39 -s ours am: 14ee2a47 -s ours am: 9c33f58b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1a70ecc0 -s ours am: 511e5556 -s ours am: 499e299f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4384f0d5 -s ours am: 3472a1a9 -s ours am: 3971413f -s ours