The old version that doesn't take a timeout now always waits forever; before it waited for a few seconds on Android debug builds. The new version has an explicit timeout that works on all platforms and returns success status. FIXES=[384043020]