Merge "Modified the RF setting." into jb-mr1-dev