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

Change-Id: Ic0a1c578ac50e567403265d9ff3349641a0a8d6a