Merge "Fix NPE in VvmSimStateTracker"
am: 7f4e6e1076

Change-Id: Ifa96426ff8a78bca883d3c59cf4c33ab3fcb4871