g3: re-enable performance profiles

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