Merge changes I9b1f20ff,I6c983872,I8691246d

* changes:
  Fix a TODO in #onHealthCheckFailed (3/n)
  Better handle cases where version code can't be resolved (2/n)
  Fix a TODO item (1/n)