Bug 575354: [*-Model] Adapt to improved extensible reconciler Change-Id: I168c8800acf084ec86b2aa629fc55a1ccb205705