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: 71e99bca am: 7b1fe539
Change-Id: I338acdaf8d8b79d9ca65022b7ec27096dd685ad9