Merge "Handle MSIM behavior for VM notifications and CFI." into lmp-mr1-dev