Merge "Unsuppress other phan issues (part 4)"