[automerger skipped] Merge "Properly use versioned interfaces." into qt-dev
am: efc774b7 -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 433f7c41 is in history
Change-Id: I43fe257d42daf3c948bae8a669f19527b99cfab8