This is a supplement for D11352.
@wsdfhjxc can you land it yourself or should I do it? I would like to land this, D11748, D11749, D11750, and D11751, so D11352 can land without the category override hack.
All of them seem to be accepted, but I can't land anything by myself. Feel free to do it on your own.