Merge "@1.2::IServiceManager:onNoClients->onClients(bool)" am: ccea91f3e1
am: 5787e6b3c2

Change-Id: Ie2eaf988162bd0e45eea76247d00a23169142dc1