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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 537b777e -s ours am: ca76a1d7 -s ours am: ad2c7e17 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d162abc6 -s ours am: 6348fd2f -s ours am: 807fcf03 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 73351e53 -s ours am: c5316e2c -s ours am: 40a059e9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c775fef -s ours am: 53579618 -s ours am: 28678ac7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d935dc8 -s ours am: 75a6b906 -s ours am: 97807569 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7df679c -s ours am: 4e4b695e -s ours am: 056f4167 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ab4c037b -s ours am: 87ce4352 -s ours am: 43cd90eb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39788775 -s ours am: df4bca91 -s ours am: 180752fa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb3a5d68 -s ours am: f7b842f2 -s ours am: 65bfa95b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73c8238c -s ours am: 0c434040 -s ours am: 3d7e21a4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a0cf158 -s ours am: b6b60ba4 -s ours am: b82e1340 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f1e0b52 -s ours am: 038f0ade -s ours am: 2de28e1a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 72a9a858 -s ours am: 7fad7946 -s ours am: d920cde6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17968daf -s ours am: c1f72aad -s ours am: c15ae7bc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 61317a98 -s ours am: 50b7e21b -s ours am: 79c049c2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 800081d3 -s ours am: 150417cb -s ours am: 9579c3fe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9a6043a2 -s ours am: 3a37f0be -s ours am: c25586a9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da558f1a -s ours am: 11535f1c -s ours am: 02fa7301 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 180b8e47 -s ours am: 107c8462 -s ours am: 2d369180 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d8849b3 -s ours am: 62d086e9 -s ours am: 045da524 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a342cdf8 -s ours am: ba082a09 -s ours am: f7f03312 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ca288ea -s ours am: fd76387b -s ours am: 3c5ba62b -s ours