Merge "Ensure that health check controller is unbound correctly" into rvc-dev...
Merge "Ensure that health check controller is unbound correctly" into rvc-dev am: 6a459b2b am: f63ca9df am: 1f3d072d
Change-Id: I946043fe0e49ea259cda349d6effb64a3e565c71