Android m preview
Merge "Clean up the sleep()'s after poking init services"