Update drustack_* branch as 7.x-22.x.