Fixing BaseMarshallingDomain usage

Change-Id: I6db8e9ec60ed3ebcedcc1cbcda3ca18e6557db4a