Fixup MSIM merge

Change-Id: Iea1bded87237ec88cea4489810facfe25d50fcee