[automerger skipped] Merge changes from topic "am-850e8d8f178c4deab0c5779bfd339edb" into qt-dev
am: 050ba1f9 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 72f53256 is in history
Change-Id: I6306edf628b4806b34dea49282a4014d75604ed0