Merge "Fix flavor_rxtx_rbac"