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

Original change: undetermined

Change-Id: I16103dfc1efa102f4c1a73134245bf0ea2593e9f