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

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