merge to Quarx: disable advanced cpu settings

Change-Id: Ib7d8318b331fb2a9ca6af402e806a348b0e4f2dd