Merge "Fix compile error when robotests references R.* in Settings"