Merge "Don't check for services before boot-complete" into honeycomb