Merge changes from topic "am-bd6de0ae8590435cb9e3a62065166165" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 510ed7f0 -s ours am: 247c8b9e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ee5f3fa -s ours am: 7c880f7e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d8ab369 -s ours am: cd28ee3e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6701905a -s ours am: c9dc92eb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3d948395 -s ours am: 094a1e83 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9ed06e6 -s ours am: 86b220c7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 33a8ba28 -s ours am: dbf6d1ee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9571f1e2 -s ours am: 8cfc7dda -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4623f973 -s ours am: ce688884 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1394d0c9 -s ours am: d38c9ba5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bd843e84 -s ours am: 7f4e0760 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ac9bd8 -s ours am: 6ee9f0e1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 66c0272a -s ours am: 2bbad352 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa6473fc -s ours am: a4585eaa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b04b6758 -s ours am: e99a03d2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71a238bc -s ours am: 4bdf6786 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4c4eb6ae -s ours am: 8bae6685 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c7a7358 -s ours am: ac74ee53 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 905e80af -s ours am: 6ed06a39 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c999273 -s ours am: 6455c0d2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fbb9ddc3 -s ours am: e738a96e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1ef08de9 -s ours am: f91a6adc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: aa3c19a8 -s ours am: ed80f229 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9cea8ee2 -s ours am: 8369b019 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2a4ef8ee -s ours am: b4dc2818 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 062f6087 -s ours am: 0b3f72a7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f3b3b1a -s ours am: 7cd33ce4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 981bffff -s ours am: 2090901f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e05b73ff -s ours am: 8729955d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ae6800b -s ours am: d1b41708 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dde8e138 -s ours am: 8f32be82 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f1c1554c -s ours am: cf1572b2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c72d2dd8 -s ours am: 84c28a96 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 489b15fa -s ours am: d695b99e -s ours