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