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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 32f174ab -s ours am: 59704d24 -s ours am: 9733e807 -s ours am: a6c8f32a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9cc84f37 -s ours am: 4a42b12f -s ours am: 75912e40 -s ours am: e55d91ec -s ours