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

Change-Id: I816ffb14027ba28c8dc815f2a74f6feea1557e3d