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

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