Bug: 208498422
Test: build pass and confirm RF configs are correct
Change-Id: I265be39d8fb33c2497beb7803c857547428cbda8