Merge proposals dependent on lp://staging/~bfiller/address-book-service/contact-list-changes

1. contact-list-changes
2. Dependent merge proposals