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

Change-Id: Ia70928ea149f491999dd7eb2f3d49d7dd5a89470