Merge proposals dependent on lp://qastaging/~nskaggs/phablet-tools/add-lp-branch-support

lp://qastaging/~nskaggs/phablet-tools/add-lp-branch-support has no merge proposals.