Add better support to enable checboxes coming from fw base features

Change-Id: I609223fde13cbc62c9f4b6cc4023a8e516370594