Merge "Revert "Ensure that health check controller is unbound correctly"" into...
Merge "Revert "Ensure that health check controller is unbound correctly"" into rvc-dev am: 4f5af837 am: 5f3325d5 am: 3b2b3dad
Change-Id: I43fc59a8aad7177d8faf2c44f62686e903612e1e