Merge "VTS: Replace deprecated 'getService' by 'waitForService'"