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

Original change: undetermined

Change-Id: I226b4ba9597cd13e5b082450da38fc5dd3e6b57c