Merge "Unsuppress other phan issues with low count"