Merge "Update mapping for the rat type in data stall proto"