Merge "Fix interaction of VMInit and ThreadStart events." am: 8c399a5e3d am: 04d187ee52
am: 9d0d7dd438

Change-Id: Ic6d9885743264e981e67a3b3706f8a76d58cb436