Merge "Silence transaction profiler master queries notices for rollback"