Merge proposals dependent on lp://qastaging/~sharoonthomas/poweremail/refactoring

lp://qastaging/~sharoonthomas/poweremail/refactoring has no merge proposals.