Merge "Update support build for release." into klp-ub-dev