Upgrade to latest git master version, which has a couple of patches to fix ofono incompatibilities. The few other patches look fine too.