Tweaks for Xenon-based profiling

Change-Id: I0f75dcbd705572682eb2e740c826425410f95c18