Merge back power capping changes for v5.6.