am d1d46d9d: am bbf849b1: Merge "Add missing profiler options."

* commit 'd1d46d9d5564a27dae45c2f2a62e6769402b556c':
  Add missing profiler options.