[automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev am: 285b665784
am: 9c1c1c03ff -s ours am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 cc65a628eb is in history Change-Id: I356601b3d10f4b3fdbe7fcf3e46762715a7cc86a
This commit is contained in: