Merge "Unbind explicit health check controller when possible" into rvc-dev am:...
Merge "Unbind explicit health check controller when possible" into rvc-dev am: d43ac6b4 am: ca7187ad
Original change: undetermined
Change-Id: I16103dfc1efa102f4c1a73134245bf0ea2593e9f