Merge "Send ThreadEnd after clearing ThreadGroup."
am: f67f115423

Change-Id: I62443de1b7a477783ceffc14f1d2c16f6ca42c6e