Merge "Update mapping for the rat type in data stall proto" am: e372df0b69 am: 413ad92be9

Change-Id: I74e8438392b3e70867144b9648f9c072bf099842