Merge "Fix interaction of VMInit and ThreadStart events."
am: 8c399a5e3d

Change-Id: I1ba1d52a95b203872627f05505952882ce3cc82b