Merge "Missed use of android_atomic and thread state_."