Merge "Unsuppress another phan issue (part 7)"