Fix after MSIM merges

Change-Id: I2c96013f6774b6eeeb88545abc93684d7f46226e