Merge "Change go/q-bg-block to g.co/dev/bgblock"