updated builder-model following a convenience API removal

Change-Id: I538652ffa6fdf05872da36dc78bb068efbdb1ad3
3 files changed