Bliss Vendor Setup [2/2]

Change-Id: I1a7ee9eff40a8821beacd02bbba115033b610356