am dba69061: Merge "Send availability info more reliably" into ics-mr0

* commit 'dba69061a6e9c25d968819cee47ab13e5b554b9a':
  Send availability info more reliably