Support for Transparent Service Instance
Change-Id: Ied19503ad596e5d50c512118ac9eb7abfcba502a