Merge "Enable a bunch of disabled phan checks that are no longer failing"