Merge tag 'for-v4.8-rc' into psy-next

Power Supply Fixes for 4.8 cycle