[automerger skipped] Merge changes I1fc3b301,Ib42ab29e into qt-dev am: 59a25ef6
am: 7ecf70b3 -s ours
am skip reason: change_id Ic61ed2784af034ed4ae4bc8346ed67c6bed04152 with SHA1 439305ca is in history
Change-Id: Ia3476f678fa06b9a7b3fc84825ff6c84b251be21