Merge "Remove interfaceChain from IServiceManager::add()" am: 2530c01a81
am: fcf61800c0

Change-Id: I8b07f991c262606c13830c1ac9b9113641062e6a