Merge proposals dependent on lp://qastaging/~untrusted-ci-dev-bot/messaging-app/messaging-app-ubuntu-yakkety-landing-002

1. messaging-app-ubuntu-yakkety-landing-002
2. Dependent merge proposals