Add more detailed profiling for some client side hotspots (#12418)

Change-Id: I27178a553571a99725ac4a75cae88d55398604ad