Merge "Removing diags for a fixed flake" into ub-launcher3-master