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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e99ee5ce -s ours am: 0a161864 -s ours am: 3f02934e -s ours am: ff469510 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5d67fd0f -s ours am: 30dfbd8c -s ours am: 8734bc8d -s ours am: 8a11595c -s ours