Merge proposals dependent on lp:~phablet-team/ofono/ota4-update

lp:~phablet-team/ofono/ota4-update has no merge proposals.