8001040: Rework RMI model

Reviewed-by: alanb, ahgross, coffeys, dmocek
8 files changed