[automerger skipped] Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: 0edeaa36 am: ec072509
am: 092b8ebc -s ours
am skip reason: change_id Idc6db433585de067e45088b43665c8e37b310397 with SHA1 91b35f88 is in history

Change-Id: I10bb7c8d36a774fb5ddf4cee37eaba9b3df8e45c