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: 30ca3c17
Change-Id: I2f7d90b4d6cd65db0751be98e446dcc2a5cb2a88