Added switch-logic for new Profiler config format

Change-Id: If28876d10407a5bd8567b7b282c754fea484367a
Merge "Added switch-logic for new Profiler config format"