Merge "Removal of more sampling profiler bits" into gingerbread