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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b579025b -s ours am: 316ef8a4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d2f687 -s ours am: a4a0946c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8266ad8a -s ours am: e7db5a21 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a37f6b56 -s ours am: 26ef6efb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d1a8b7d -s ours am: 8e1ceff9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d1f337c -s ours am: 9a40c4a5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0e598476 -s ours am: 3625363f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2e41046 -s ours am: de67808a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0ec12c07 -s ours am: 07981a1e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c0ba3a7f -s ours am: ea4c94db -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5b67b668 -s ours am: 7ab73bce -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e5d3442 -s ours am: e6105710 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 05437238 -s ours am: ddc32129 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f7df85c -s ours am: 4e8e0ab4 -s ours