Adding flavorRef to Service

Change-Id: I2389b6222737dec7fb6c3540c0a42c445f4c567f