Merge "Skip direct boot test for non-fbe device"