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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 5fb85870 -s ours am: 2fd0d91f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152308d -s ours am: ba758417 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 01a8e9ec -s ours am: 936e7d71 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9f1fa1 -s ours am: e89cfaf7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 71e2f64a -s ours am: a42dace2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbd5d8de -s ours am: e4c47950 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 87f02b54 -s ours am: d1f6b97c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b4c19a9 -s ours am: 3c32e946 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0d5293b -s ours am: 7d4c4eaf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eaf7f82e -s ours am: 39be29d7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 41ca0439 -s ours am: bdd0e549 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6e5242 -s ours am: 470b5504 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c8211b3d -s ours am: 376fcc28 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f297e23 -s ours am: 6640c9d8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0200dbf4 -s ours am: b34d8ec9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eee325ee -s ours am: 3ecfa06f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 872605e8 -s ours am: 5f641588 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1959819 -s ours am: 9d6f445e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b0f24f61 -s ours am: cb6e3101 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2780b111 -s ours am: cfdcc5a6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d6a24900 -s ours am: 335e769b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75b6e646 -s ours am: 73fe3d9a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b5b4e7c8 -s ours am: f85840df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a813c5b0 -s ours am: 86201872 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ea58b4b2 -s ours am: 358f9065 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c0ba2bd7 -s ours am: 95beab07 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8283c744 -s ours am: b24bf440 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6702881 -s ours am: 2198b52f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d73df5d7 -s ours am: 1e305c32 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45719ed3 -s ours am: f4f258ad -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 59be761e -s ours am: 0b0d4939 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51d97ca5 -s ours am: dcdb5a90 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 5357e7ab -s ours am: d453193f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cafa9c -s ours am: bdb53e21 -s ours