Merge "Updating builder-model to the latest version 2.2.0-dev (CL 1 of 3)."