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: 2b132137
Original change: undetermined
Change-Id: Ibdfdb41e8b32d9db9f8b649c44fdf07e74df38f4