Merge "Fix failing VendorServiceControllerTest caused by API change" into qt-dev am: 548e82e6e2
am: 989341a583

Change-Id: I675d68eaf46152dba113ed3751b01eb96b3f45b6