s4-common: Re-enable performance profiles

Change-Id: Ifbe58a3690059ce134f7c433d79da5797a08b048
Merge branch 'cm' into HEAD