Merge proposals dependent on lp://qastaging/~ci-train-bot/address-book-app/address-book-app-ubuntu-yakkety-landing-031

1. address-book-app-ubuntu-yakkety-landing-031
2. Dependent merge proposals