Merge proposals dependent on lp://staging/~morphis/ofono/ota9-wakelock-support

lp://staging/~morphis/ofono/ota9-wakelock-support has no merge proposals.