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