radio-iris: Sync with CAF's kk_2.7.1 branch