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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4f -s ours am: a42171c2 -s ours am: bef7ad14 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2 -s ours am: cd61c387 -s ours am: ccdb8bd5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2114617 -s ours am: 6db59420 -s ours am: 72d054d5 -s ours