[automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev...
[automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev am: 285b6657 -s ours am: 17878377 -s ours
am: 0fbaef40 -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 9869b47c is in history
Change-Id: I85bfb02cecefcbe771d2e09e148a0a97acba75f7