Merge commit '93ca790c025d51780bff9be42cffdd0055091edb' * commit '93ca790c025d51780bff9be42cffdd0055091edb': Various infrastructure to support a running services UI.
Merge commit '93ca790c025d51780bff9be42cffdd0055091edb' * commit '93ca790c025d51780bff9be42cffdd0055091edb': Various infrastructure to support a running services UI.