Merge "Revert "Developer option to enable CBRS""