Merge "Fix assert when disabling VVM" am: 444a3aea72
am: 3aad1f17ef

Change-Id: I58b6759cae94354cc6fe3fa50c39db82a326cbe7