am b008c449: am 20aa7cbe: Merge "Fixed and refactored profiler options handling"

* commit 'b008c4493d5c4fc32db721074716a942fbede474':
  Fixed and refactored profiler options handling