Merge "Fix race condition generating READY and NOT_SUPPORTED statuses."