Auto merge of #161215 - tgross35:update-builtins, r=tgross35