Merge "Fix remaining broadcastradio 1.1 VTS TODOs." into oc-mr1-dev