Miscellaneous profiling fixes

Change-Id: I8d8ce0bc0383e4feb4ed38fd96b2dd516dcb742e
Merge "Miscellaneous profiling fixes"