am 56464091: am 87dd6440: Merge "Revert "Move tlcd_sock policy over to manta.""

* commit '56464091c63a43ab547f107720a9d41e3fc5d6ea':
  Revert "Move tlcd_sock policy over to manta."