[automerger skipped] Merge "Properly use versioned interfaces." into qt-dev am: efc774b76c am: 19420eb973 -s ours
am:4305731fc0-s ours am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1433f7c4178is in history Change-Id: Iffdde8d9465ac6b0526127f96380210618ae459a
This commit is contained in: