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