Merge branches 'pm-avs' and 'powercap'