Auto merge of #161014 - jhpratt:rollup-lyWH2E3, r=jhpratt