Merge "Add alias as prefix for flavor_rxtx v3"