Revert of Revert of S-o-m uses default bucket (patchset #1 id:1 of https://codereview.chromium.org/920123004/)
Revert of Revert of S-o-m uses default bucket (patchset #1 id:1 of https://codereview.chromium.org/920123004/)

Reason for revert:
It actually does work, it just needed a little stip magic.

Original issue's description:
> Revert of S-o-m uses default bucket (patchset #1 id:1 of https://codereview.chromium.org/926593004/)
>
> Reason for revert:
> This fix does not work.
>
> Original issue's description:
> > S-o-m uses default bucket
> >
> > BUG=
> >
> > Committed: https://chromium.googlesource.com/infra/infra/+/e68bc6b3fef5decfd22e48e1bbc056dfbde800e3
>
> TBR=stip@chromium.org,seanmccullough@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=
>
> Committed: https://chromium.googlesource.com/infra/infra/+/030c9410575d0fe53be39f4beacb682241c5a6a7

TBR=seanmccullough@chromium.org,pgervais@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/923073004

nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra