Auto merge of #161272 - jhpratt:rollup-jsiL9GA, r=jhpratt