Merge \"Clean up profiler options\"
am: 04a23d7e10

Change-Id: Ia1e7da49795b9e12819c5193de761b8b6ed63ce4