Cleaned up profiler config.

Change-Id: Ibee65681ba649a9912e43ccddf03e7f065f6bb27
Merge "Cleaned up profiler config."