[automerger skipped] Merge "Change to choice" into qt-dev am: d69eb245 -s ours
am: e4b6f2d0 -s ours
am skip reason: change_id I72866da5b2a8ac37d725f5b604dae37a06f30162 with SHA1 560de692 is in history
Change-Id: Ibae8597ceff0b8e961e18afc81296524c5d7f403