Merge "Fix NPE in VvmSimStateTracker" am: 7f4e6e1076
am: 4639555d19

Change-Id: I8f02b0aa22d333639670e13d8b38072acf35ac86