Merge "Fix non-Baker build."