Merge "Change getService (deprecated) to waitForService"