Merge "Unbind explicit health check controller when possible" into rvc-dev am: d43ac6b413

Original change: undetermined

Change-Id: I01b295a1e8d57194c4c182a2c3b975a611ebe6a6