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: 76506146 -s ours am: 576f3e0f -s ours am: 2c9d2461 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c82b58f -s ours am: c905a29a -s ours am: c16d7018 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f115bf75 -s ours am: 3f4af1a5 -s ours am: c03d5041 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4af423 -s ours am: b97c4f9d -s ours am: 354c8c29 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb7e3597 -s ours am: 02a6d672 -s ours am: 39e6a3ab -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0a2995c -s ours am: 334d87ea -s ours am: fe354705 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fd677dc3 -s ours am: 23e673d0 -s ours am: aefbb883 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a966d584 -s ours am: b4bc5255 -s ours am: bc2b609c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 576024dd -s ours am: 21e1168e -s ours am: c55d7503 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24fa4abe -s ours am: 21310341 -s ours am: daebe96d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6aa22d0c -s ours am: b2113245 -s ours am: 096f4a31 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 520d2c01 -s ours am: f308d484 -s ours am: 13e67507 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e595c6f4 -s ours am: 9248280f -s ours am: ccac7b54 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ccfb287c -s ours am: 624f2e42 -s ours am: 66ccea68 -s ours