[automerger skipped] Merge changes I82856f84,I97c44ff8 into qt-dev am: 5d6551b5
am: e96f25a6 -s ours
am skip reason: change_id I04e890f2249f00cc74d2311711e291efa73a9a49 with SHA1 f2ac8365 is in history
Change-Id: Ibbe71680bfb8de3a92633685cb6808fff2d534e1