Fix the build and adapt features for MSIM

Change-Id: I43de2ccb88dec5d7170b3a1f89d34cf545a8792d