Merge proposals dependent on lp://staging/~ci-train-bot/qtubuntu-sensors/qtubuntu-sensors-ubuntu-xenial-landing-023

1. qtubuntu-sensors-ubuntu-xenial-landing-023
2. Dependent merge proposals