Merge "Remove comment about disabled tests"