[automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev
am: 285b6657 -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 cc65a628 is in history
Change-Id: Iddb2d6487a118102eeeedd03c876cd4ec137427e