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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 59f442620e -s ours am: ff8a79362d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe1d04481b -s ours am: 971ec6275e -s ours