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