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

Change-Id: I1d13c351b7c5c2a3fad02b151099ff53d39e7b6f