Merge "Fix NPE in VvmSimStateTracker"