Merge "Unregister Waiter in waitForService" am: e395da3058
am: 7e1ed44b1b

Change-Id: Ie634000a70236872cf093c01bb57ccc895ee85a0