Merge "Revert "Make bluetooth enforcing.""