Merge changes from topic "cherrypicker-L56500000960243519:N87700001362502878" into udc-dev

* changes:
  [automerge] Add MdnsServiceCache 2p: 9d9ae4d2a1
  Add MdnsServiceCache