More profiling

Change-Id: I0d5a76bfd7387d72309920786e6d673537ccc09b