Merge "Fix bypassing the restriction by RadioInfo"