Merge "Backport multi user trace changes."