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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6878f83 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee71a33c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5d4e4a45 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 580706a6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b5cf06bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02a7eb5d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b94de26c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96b6ba40 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7079b6cc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f050b7a2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2b89115f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad7e64fc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1754f11a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ccc8b465 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 11935a9f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5d45af10 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c517fedd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd9f342 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a12f9a03 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65ea182e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8bcc4ac -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf156945 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cbf1612a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ccbb6a13 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3dbe1abb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01c2a4b8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 980acc2a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 389bc8bd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3e3c4196 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64452e94 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 682fe904 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64162ee4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 239665c3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c48d6ca -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2376786 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8816c54b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 29aa5757 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99e38488 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6a39129e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba654e5 -s ours