shootervm: updates for EV

Change-Id: I9bbca5118fd7a51e5e25f27d048a2f8fb5133f5a
shootervm: MMS fix

Change-Id: I7431a75400efe5a6047ae9a708917095b0a2888e