Fix issue with observing invalid thread state.
am: 4847a07138

Change-Id: If70cd64f5ecdf254d24744288e45f16dcc3e9c39