am 8922ddba: am a6e06889: Merge "Add profiler type options"

* commit '8922ddbab1e394a59f957e8598fbbf88357e7838':
  Add profiler type options