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