Follow-up Ia268c3a49: Actually hide the BF behind a feature flag

Change-Id: I9bfbfb4512bc6d5c96cdd8e7f75056f0e26b2016