Merge "Fix mac builds due to unguarded-availability error"