Merge "Remove some getDevice().waitForDeviceAvailable()s"