Merge "Removing condition for CUJ tracing/metrics" into ub-launcher3-master