Merge changes from topics "128902411", "128645056"

* changes:
  API Feedback for CBRS
  Remove clearDefaultsForInactiveSubIds.