Fix profiling error

Start profiling where it actually matters

Change-Id: I85fff08f937abb3f8a42949fb97e29032b961b86