[automerger skipped] Merge "Properly use versioned interfaces." into qt-dev
am: efc774b76c -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 d313b755ab is in history

Change-Id: I43fe257d42daf3c948bae8a669f19527b99cfab8
tree: 15d21389d4a27c0cec476b084c0afd00cbdff6e8
  1. core/
  2. services/
  3. tests/