Merge "Update the waitUntilReady/setReady logic to use java blocking"