Merge "Make builder typesafe by default and deprecate type-unsafe interfaces"