Code review comment for lp:~awe/phablet-extras/ofono-flatten

Good, and as we discussed over IRC, let's try to either split the code or improve our development method to allow a distro patch only to be pushed at s.