Merge change 23403 into eclair

* changes:
  Various infrastructure to support a running services UI.