Merge proposals dependent on lp://qastaging/~afrantzis/powerd/fix-1531158

lp://qastaging/~afrantzis/powerd/fix-1531158 has no merge proposals.