am cb99da56: am 9efae33b: Merge "Handle MSIM behavior for VM notifications and CFI." into lmp-mr1-dev

* commit 'cb99da5671457e6d69fdcd47e6ccc7657b23e60b':
  Handle MSIM behavior for VM notifications and CFI.