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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca -s ours am: 6e55d384 -s ours am: 3787e12f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788 -s ours am: 47229f85 -s ours am: 2aaed05e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e -s ours am: 69138bb4 -s ours am: 10f99a7f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c5 -s ours am: 8e1bdee1 -s ours am: 2386df54 -s ours