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