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

Change-Id: I2056a8dfd67d3bf7b31802b64b1e512d77f37f73