Merge "Unregister Waiter in waitForService"
am: e395da3058

Change-Id: I6ddab6daf386852ba0bd7e159aabfe839450991b