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