Merge "Move device bootcomplete check to waitForAvailable."