Delay bottleservice until product and variant checks are passed

Change-Id: I65a595fbe385d54a4dbc5622d82046160f8f1885