[automerger skipped] Merge "Properly use versioned interfaces." into qt-dev am: eb38470a -s ours
am: db8e33c0 -s ours
am skip reason: change_id Iaa979e836ad18a1507fa9c3b2522ea6d0b69c650 with SHA1 bdf23af0 is in history
Change-Id: I2b2560d3cec60768b738cc6d864223f873f49c35