This is to simplify client and LRC logic when working with
models which store objects of multiple types.

Issue: #81198
Change-Id: Ibae1f96f8d2ceb25cae5fb7c9974f77a612707d0