Merge changes from topic "on_unavailable_fix" into qt-dev
am: 285b665784

Change-Id: Ic582500e48ee42b1f87f0310cb1ef599757b9776