Gather more profiling data (#10961)

Change-Id: Ifbb2037290a89fd289407d722962b08f286d887e