Merge "Fix NPE in VvmSimStateTracker" am: 7f4e6e1076 am: 4639555d19
am: 5d840d0863  -s ours

Change-Id: Ia1f6313f11a1a117172b03c5dd57fe5e06123999