Merge "Properly use versioned interfaces." into qt-dev
am: eb38470a80

Change-Id: I13f5219447b259ac617b350d8130fabbf1784dec