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

Change-Id: I1759ff0fdbbdc27501213acb4b77051a184c8fc7