Merge "API Feedback for CBRS" am: 9c706654a2
am: f9edc9fffd

Change-Id: I7c449a129ab8bd759b40e0aa0a429dd7847ef755