Merge changes from topic "am-65dc97dc5c204dca84b64a144ce9c692" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7ba0aed9 -s ours am: 2ec48c59 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65bdbb6f -s ours am: 6fde69d6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ec6b5bc4 -s ours am: ac74f185 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6735e3b2 -s ours am: aaea8772 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 987185e2 -s ours am: 05f34e57 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218ff3c5 -s ours am: b944ba2d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6f7f0d3b -s ours am: 58c8b3da -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5075cde -s ours am: 10c6cddc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 17e4fbd3 -s ours am: ced34363 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42ee781c -s ours am: 29d5e806 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c7e9b481 -s ours am: ce16e805 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a02c560 -s ours am: 5a2277ea -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 19e31288 -s ours am: 7ab2e3a8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7345459e -s ours am: dfe0b651 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 22ac7fbf -s ours am: 2a5e8aa2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b665249e -s ours am: d39f0c7b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 094f63fe -s ours am: 6dd7c04a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d326e50 -s ours am: 6b2fae09 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2c1d1b85 -s ours am: 07896a50 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b732e47d -s ours am: d242d955 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 366d5ca8 -s ours am: fefacad8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 681c686b -s ours am: 7ca0ba46 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cbb92b94 -s ours am: 9f1114e5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 214d9344 -s ours am: 60976e7a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 79e82c5b -s ours am: 58bfbf11 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 119ad640 -s ours am: aeeb6705 -s ours