Merge proposals dependent on lp://staging/~ci-train-bot/phablet-tools/phablet-tools-ubuntu-yakkety-landing-1904

1. phablet-tools-ubuntu-yakkety-landing-1904
2. Dependent merge proposals