Merge "Fixes for CBRS" into qt-r1-dev
am: 65e4bc410d

Change-Id: I8d90c69aa52f76bbc5ffae5f9883f3ca81bd323c