Merge proposals dependent on lp://staging/kernel-setup-sh

lp://staging/kernel-setup-sh has no merge proposals.