Merge proposals dependent on lp://qastaging/~canonical-platform-qa/address-book-app/add-photo-helper

1. add-photo-helper
2. Dependent merge proposals