Merge changes from topic "am-a00dfb2e5ead4a66921d6a79afb923ab" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2f3499c5 -s ours am: c6eeba23 -s ours am: 7b661dba -s ours am: ab349ef3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6ef7afc -s ours am: e4833ca0 -s ours am: 84cb7201 -s ours am: 3883fca6 -s ours