Merge proposals dependent on lp://qastaging/~ci-train-bot/gallery-app/gallery-app-ubuntu-yakkety-landing-088

1. gallery-app-ubuntu-yakkety-landing-088
2. Dependent merge proposals